Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 24 May 2010 12:00:00 +0000 (12:00 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 24 May 2010 12:00:00 +0000 (12:00 +0000)

Trivial merge